libBLOC

diff --git a/tree/tree.c b/tree/tree.c
index 1bffd72..6e23c5a 100644
--- a/tree/tree.c
+++ b/tree/tree.c
@@ -28,7 +28,6 @@
 #include <BLOC/object.h>
 #include <BLOC/tree.h>
 #include "../assert.h"
-#include "../object.h"
 #include "tree.h"
 
 static void _tree_new(void *);
diff --git a/tree/tree_add.c b/tree/tree_add.c
index 67397ba..bca8c7e 100644
--- a/tree/tree_add.c
+++ b/tree/tree_add.c
@@ -20,7 +20,6 @@
 #include <BLOC/object.h>
 #include <BLOC/tree.h>
 #include "../assert.h"
-#include "../object.h"
 #include "tree.h"
 
 /* Add a node to a tree recursively */
@@ -72,9 +71,8 @@ tree_add(Tree *tree, void *obj)
 {
 	ASSERT(tree);
 	ASSERT(obj);
-	struct ObjectHeader *header = object_header(obj);
-	ASSERT(header->magic == OBJECT_MAGIC);
-	if (tree->type && tree->type != header->type)
+	ASSERT(obj_verify(obj));
+	if (tree->type && tree->type != obj_type(obj))
 		return;
 
 	struct TreeNode *node;
diff --git a/tree/tree_remove.c b/tree/tree_remove.c
index 6510a03..6f1ad90 100644
--- a/tree/tree_remove.c
+++ b/tree/tree_remove.c
@@ -48,7 +48,7 @@ _tree_remove_r(Tree *t, struct TreeNode *parent, struct TreeNode *child)
 	} else if (t->compare(parent->header.obj, child->header.obj) < 0) {
 		parent->right = _tree_remove_r(t, parent->right, child);
 	} else {
-		/* Less that two children: adopt child if available */
+		/* Less than two children: adopt child if available */
 		if (!child->left)
 			return child->right;
 		if (!child->right)
@@ -75,11 +75,10 @@ tree_remove(Tree *tree, void *obj)
 {
 	ASSERT(tree);
 	ASSERT(obj);
-	struct ObjectHeader *header = object_header(obj);
-	ASSERT(header->magic == OBJECT_MAGIC);
+	ASSERT(obj_verify(obj));
 	if (!tree->header.start)
 		return;
-	if (tree->type && tree->type != header->type)
+	if (tree->type && tree->type != obj_type(obj))
 		return;
 	obj_lock(tree);
 
@@ -93,7 +92,7 @@ tree_remove(Tree *tree, void *obj)
 	/* Unlink from tree */
 	tree->root = _tree_remove_r(tree, tree->root, node);
 
-	/* Unlink from linear list*/
+	/* Unlink from linear list */
 	if (tree->header.start == &node->header)
 		tree->header.start = node->header.next;
 	if (tree->header.end == &node->header)