--- C:/Users/unbeknownst/AppData/Local/Temp/_cbsonmodule_HEAD.c	Wed Mar 23 15:23:25 2011
+++ C:/Devlp/mongo-python-driver/bson/_cbsonmodule.c	Wed Mar 23 15:21:26 2011
@@ -35,2 +35,3 @@
 static PyObject* ObjectId = NULL;
+static PyObject* _ObjectIdFromString = NULL;
 static PyObject* DBRef = NULL;
@@ -193,2 +194,3 @@
         _reload_object(&ObjectId, "bson.objectid", "ObjectId") ||
+        _reload_object(&_ObjectIdFromString, "bson.objectid", "_ObjectIdFromString") ||
         _reload_object(&DBRef, "bson.dbref", "DBRef") ||
@@ -1020,3 +1022,3 @@
         {
-            value = PyObject_CallFunction(ObjectId, "s#", buffer + *position, 12);
+            value = PyObject_CallFunction(_ObjectIdFromString, "s#", buffer + *position, 12);
             if (!value) {
@@ -1123,3 +1125,3 @@
             *position += collection_length + 1;
-            id = PyObject_CallFunction(ObjectId, "s#", buffer + *position, 12);
+            id = PyObject_CallFunction(_ObjectIdFromString, "s#", buffer + *position, 12);
             if (!id) {