--- deliantra/server/include/object.h	2006/08/26 23:36:32	1.7
+++ deliantra/server/include/object.h	2006/08/28 16:52:51	1.10
@@ -101,8 +101,8 @@
  * MSW 2002-07-05
  */
 
-struct object_simple : extendable<object> {
-    data_type get_dt () const { return DT_OBJECT; }
+struct object_simple : attachable<object> {
+    static data_type get_dt () { return DT_OBJECT; }
 
     /* These variables are not changed by copy_object() */
     struct pl	*contr;		/* Pointer to the player which control this object */
@@ -260,16 +260,6 @@
 };
 
 struct object : object_special, object_simple {
-  void instantiate_ ();
-  void instantiate ()
-  {
-    if (attach)
-      {
-        instantiate_ ();
-        free_string (attach);
-        attach = 0;
-      }
-  }
   void clone (object *destination)
   {
     if (attach)