Use the `objects` service everywhere and various fixes.