Revert "Clean up object.h"

This reverts commit 7628f731dea61d6392a79d65bdb9b65503047bd7.