Move some things from object.h to better places