diff --git a/flake.nix b/flake.nix
index 6706269..3667723 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,13 +6,27 @@
 
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    home-manager = {
+      url = "github:nix-community/home-manager/release-25.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
+    impermanence.url = "github:nix-community/impermanence";
+
+    sops = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     disko = {
       url = "github:nix-community/disko/latest";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    sops = {
-      url = "github:Mic92/sops-nix";
+    comin = {
+      url = "github:nlewo/comin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -26,14 +40,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # For Workstations
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-
-    home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     vscode-extensions = {
       url = "github:nix-community/nix-vscode-extensions";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -49,14 +55,6 @@
       flake = false;
     };
 
-    # For Servers
-    impermanence.url = "github:nix-community/impermanence";
-
-    comin = {
-      url = "github:nlewo/comin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     radicale-birthday-calendar = {
       url = "github:iBigQ/radicale-birthday-calendar";
       flake = false;
diff --git a/justfile b/justfile
index 17be5b2..8c2b98f 100644
--- a/justfile
+++ b/justfile
@@ -25,7 +25,7 @@ repair:
 
 [group('utility')]
 repl host='$(hostname)':
-    nixos-rebuild repl --flake .#{{ host }}
+    nix repl .#allHosts.{{ host }}
 
 [group('rebuild')]
 rebuild mode: