diff --git a/apps/default.nix b/apps/default.nix
index 6a0619f71fb1017f051bfa0f5703e0d0facc6e1a..d957bcbd1210b83c20ba04ffc4c3a6a93cfb161d 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -43,9 +43,6 @@       nixfmt
 
       # IDEs
       jetbrains.goland
-
-      # Personal NUR
-      nur.repos.jolheiser.tmpl
     ];
     stateVersion = "22.11";
   };
diff --git a/flake.lock b/flake.lock
index 0d64841c7bacf9cbca9c7272df57b8c66c85a69e..d7f6729b3d72e22f971806ae3982110b08e6badd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1688552611,
+        "lastModified": 1687969886,
-        "narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=",
+        "narHash": "sha256-tC2qFLmuM0PFaw0tMHVcFmzsG/351q09qa1EpuL2n1U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85",
+        "rev": "a7002d6bfca54742d5fc9b485a1879953b4585b9",
         "type": "github"
       },
       "original": {
@@ -20,50 +20,17 @@         "repo": "home-manager",
         "type": "github"
       }
     },
-    "jolheiser-nur": {
-      "inputs": {
   "nodes": {
       },
       "locked": {
-        "lastModified": 1688586089,
-        "narHash": "sha256-k9UncsfiA1bBzlrLJKQ/USRb19Qbqmyp3CtKy6cQ5Mg=",
-        "ref": "refs/heads/main",
-        "rev": "04bf865f3a1608241ddb24dd8272a8bd3c9027db",
-  "nodes": {
         "nixpkgs": [
-        "type": "git",
-        "url": "https://git.jojodev.com/jolheiser/nur"
       },
-      "original": {
-        "type": "git",
-        "url": "https://git.jojodev.com/jolheiser/nur"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-  "nodes": {
+        "nixpkgs": [
       "locked": {
     "home-manager": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
-        "type": "github"
       },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-    "home-manager": {
           "nixpkgs"
-        "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de",
         "type": "github"
       },
       "original": {
@@ -74,13 +41,13 @@       }
     },
     "nur": {
       "locked": {
-      "inputs": {
+          "nixpkgs"
 {
-      "inputs": {
+          "nixpkgs"
   "nodes": {
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "3645cae8032682e662c1723dab52fdbfd1f4aad1",
+        "rev": "57b0c0f3b43b869d3fe5356062e29fd061013ea7",
         "type": "github"
       },
       "original": {
@@ -92,9 +59,8 @@     },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+          "nixpkgs"
       "inputs": {
-        ]
-        "nixpkgs": "nixpkgs_2",
         "nur": "nur"
       }
     }
diff --git a/flake.nix b/flake.nix
index 03ef6932e24f04d4f03a0f76a3276a3bcfdc55b0..9f4a60f34240280c47fa493cc338f7dcda2302a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,20 +7,16 @@     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nur.url = "github:nix-community/nur";
-    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
   };
 
   nixConfig = { warn-dirty = false; };
 
-  outputs = { self, nixpkgs, home-manager, jolheiser-nur, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, ... }@inputs:
     let
       overlays = final: prev: {
         nur = import inputs.nur {
           nurpkgs = prev;
           pkgs = prev;
-          repoOverrides = {
-            jolheiser = import jolheiser-nur { pkgs = prev; };
-          };
         };
       };
       commonConfig = { username }:
diff --git a/justfile b/justfile
index 6468d4b7449e2fe7e8e52d7a09904b5be7dcf106..46416552bee55451eb67a5e071b02d50ec1ea066 100644
--- a/justfile
+++ b/justfile
@@ -8,8 +8,9 @@ 	@git add .
 	@sudo nixos-rebuild --flake . {{args}}
 
 # Rebuild the current machine
-switch *args:
+switch:
 [private]
+rebuild *args:
 
 # Update the flake
 update: