Moved object ids of builtin types to object.hpp. Added more object ids.