diff --git a/ChangeLog b/ChangeLog
index 6076ef3c8e..5916a00ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 17 22:07:16 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (Init_GC): move #__id__ and #object_id to BasicObject.
+	  [ruby-dev:42778]
+
 Fri Dec 17 19:35:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/mkmf/base.rb (TestMkmf::FakeLog): capture output from mkmf.
diff --git a/gc.c b/gc.c
index 7a807d6909..c8ddd38509 100644
--- a/gc.c
+++ b/gc.c
@@ -3495,8 +3495,8 @@ Init_GC(void)
     OBJ_TAINT(nomem_error);
     OBJ_FREEZE(nomem_error);
 
-    rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
-    rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
+    rb_define_method(rb_cBasicObject, "__id__", rb_obj_id, 0);
+    rb_define_method(rb_cBasicObject, "object_id", rb_obj_id, 0);
 
     rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);