Fix ObjectIdField bug.

ObjectIdField's were mistakenly being set to an Object Id if their value was
None.