Lean on object service for singleton retrieval

Instead of maintaining our own list of singletons, we should be using
the ObjectService.