refactoring in ObjectIdServer