2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ee1f7081a..6dd856237d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@ Wed Dec 22 07:59:23 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* NEWS: add IO#advise. [ruby-core:33110] [Ruby 1.9-Feature#4038]
 
+Tue Dec 21 23:45:31 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (Init_GC): move back object_id to Kernel. [ruby-dev:42840]
+
 Tue Dec 21 12:45:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (target_archs): remove temporary objects.
diff --git a/gc.c b/gc.c
index c8ddd38509..04e87d38ef 100644
--- a/gc.c
+++ b/gc.c
@@ -3496,7 +3496,7 @@ Init_GC(void)
     OBJ_FREEZE(nomem_error);
 
     rb_define_method(rb_cBasicObject, "__id__", rb_obj_id, 0);
-    rb_define_method(rb_cBasicObject, "object_id", rb_obj_id, 0);
+    rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
 
     rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);