Handle ObjectID correctly

For #6