diff --git a/Content.Client/Friction/TileFrictionController.cs b/Content.Client/Friction/TileFrictionController.cs
index 82ae1dc86a..0b8aaeff55 100644
--- a/Content.Client/Friction/TileFrictionController.cs
+++ b/Content.Client/Friction/TileFrictionController.cs
@@ -9,7 +9,7 @@ namespace Content.Client.Friction
         public override void Initialize()
         {
             base.Initialize();
-            Mover = EntitySystem.Get<SharedPhysicsSystem>().GetController<MoverController>();
+            Mover = Get<MoverController>();
         }
     }
 }
diff --git a/Content.Server/Friction/TileFrictionController.cs b/Content.Server/Friction/TileFrictionController.cs
index 475c799f7e..cded1a2750 100644
--- a/Content.Server/Friction/TileFrictionController.cs
+++ b/Content.Server/Friction/TileFrictionController.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Friction
         public override void Initialize()
         {
             base.Initialize();
-            Mover = EntitySystem.Get<SharedPhysicsSystem>().GetController<MoverController>();
+            Mover = Get<MoverController>();
         }
     }
 }
diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs
index 146a2985ed..faee4d2ef3 100644
--- a/Content.Server/Physics/Controllers/ConveyorController.cs
+++ b/Content.Server/Physics/Controllers/ConveyorController.cs
@@ -13,14 +13,13 @@ namespace Content.Server.Physics.Controllers
 {
     internal sealed class ConveyorController : VirtualController
     {
-        private ConveyorSystem _conveyor = default!;
-
-        public override List<Type> UpdatesAfter => new() {typeof(MoverController)};
+        [Dependency] private readonly ConveyorSystem _conveyor = default!;
 
         public override void Initialize()
         {
+            UpdatesAfter.Add(typeof(MoverController));
+
             base.Initialize();
-            _conveyor = EntitySystem.Get<ConveyorSystem>();
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)
diff --git a/Content.Server/Physics/Controllers/PullController.cs b/Content.Server/Physics/Controllers/PullController.cs
index 3625850847..191a8279e2 100644
--- a/Content.Server/Physics/Controllers/PullController.cs
+++ b/Content.Server/Physics/Controllers/PullController.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Content.Shared.Pulling;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Controllers;
@@ -33,15 +34,13 @@ namespace Content.Server.Physics.Controllers
         // Velocity change of -LinearVelocity * frameTime * this
         private const float SettleShutdownMultiplier = 20.0f;
 
-        private SharedPullingSystem _pullableSystem = default!;
-
-        public override List<Type> UpdatesAfter => new() {typeof(MoverController)};
+        [Dependency] private readonly SharedPullingSystem _pullableSystem = default!;
 
         public override void Initialize()
         {
-            base.Initialize();
+            UpdatesAfter.Add(typeof(MoverController));
 
-            _pullableSystem = EntitySystem.Get<SharedPullingSystem>();
+            base.Initialize();
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)