Modify to use correct MongoDB ObjectID