Minor refactoring.

`ObjectIdType` instead of `NumberType`.