2 files changed, 13 insertions, 17 deletions
diff --git a/spec/mspec/lib/mspec/mocks/mock.rb b/spec/mspec/lib/mspec/mocks/mock.rb
index 1557f2008e..9fc72b5631 100644
--- a/spec/mspec/lib/mspec/mocks/mock.rb
+++ b/spec/mspec/lib/mspec/mocks/mock.rb
@@ -1,9 +1,5 @@
 require 'mspec/expectations/expectations'
 
-class Object
-  alias_method :__mspec_object_id__, :object_id
-end
-
 module Mock
   def self.reset
     @mocks = @stubs = @objects = nil
@@ -22,7 +18,7 @@ module Mock
   end
 
   def self.replaced_name(obj, sym)
-    :"__mspec_#{obj.__mspec_object_id__}_#{sym}__"
+    :"__mspec_#{obj.__id__}_#{sym}__"
   end
 
   def self.replaced_key(obj, sym)
diff --git a/spec/mspec/lib/mspec/mocks/object.rb b/spec/mspec/lib/mspec/mocks/object.rb
index f4652a4671..19a50ac4e1 100644
--- a/spec/mspec/lib/mspec/mocks/object.rb
+++ b/spec/mspec/lib/mspec/mocks/object.rb
@@ -1,10 +1,6 @@
 require 'mspec/mocks/proxy'
 
 class Object
-  def stub!(sym)
-    Mock.install_method self, sym, :stub
-  end
-
   def should_receive(sym)
     Mock.install_method self, sym
   end
@@ -14,15 +10,19 @@ class Object
     proxy.exactly(0).times
   end
 
-  def mock(name, options={})
-    MockObject.new name, options
+  def stub!(sym)
+    Mock.install_method self, sym, :stub
   end
+end
 
-  def mock_int(val)
-    MockIntObject.new(val)
-  end
+def mock(name, options={})
+  MockObject.new name, options
+end
 
-  def mock_numeric(name, options={})
-    NumericMockObject.new name, options
-  end
+def mock_int(val)
+  MockIntObject.new(val)
+end
+
+def mock_numeric(name, options={})
+  NumericMockObject.new name, options
 end