Index: kernel/generic/include/cap/cap.h
===================================================================
--- kernel/generic/include/cap/cap.h	(revision e394c1962a6fec2218e561da2994f4070e2be503)
+++ kernel/generic/include/cap/cap.h	(revision d2e0af475248fbaed0e492a9193a1c189871e3f1)
@@ -70,4 +70,8 @@
 } kobject_ops_t;
 
+extern kobject_ops_t *kobject_ops[];
+
+#define KOBJECT_OP(k)	kobject_ops[(k)->type]
+
 /*
  * Everything in kobject_t except for the atomic reference count, the capability
@@ -82,6 +86,4 @@
 	/** List of published capabilities associated with the kobject */
 	list_t caps_list;
-
-	kobject_ops_t *ops;
 
 	union {
@@ -139,6 +141,5 @@
 extern kobject_t *kobject_alloc(unsigned int);
 extern void kobject_free(kobject_t *);
-extern void kobject_initialize(kobject_t *, kobject_type_t, void *,
-    kobject_ops_t *);
+extern void kobject_initialize(kobject_t *, kobject_type_t, void *);
 extern kobject_t *kobject_get(struct task *, cap_handle_t, kobject_type_t);
 extern void kobject_add_ref(kobject_t *);