[TASK] Exchange manually instantiated ObjectManager for a DI one