diff --git a/flake.lock b/flake.lock
index 9d4edaa..3ef70dd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,16 +91,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1635938902,
-        "narHash": "sha256-OBNfFnozDdpLrvQpjkpTvWhVzSHAhz1INALKyK7q2vk=",
-        "owner": "sbruder",
+        "lastModified": 1638267006,
+        "narHash": "sha256-heZdDlD09rnoeEiZ4wKfbXNDkO5I9qVFvX9d790h/XE=",
+        "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d2d1f2f7f1bc53984f1d9932b4ad131a95032db2",
+        "rev": "3e93c4e8b2b479c712b7c20a428993b459118842",
         "type": "github"
       },
       "original": {
-        "owner": "sbruder",
-        "ref": "release-21.05-neovim-lua",
+        "owner": "nix-community",
+        "ref": "release-21.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -187,16 +187,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1637316267,
-        "narHash": "sha256-hfAA/0W3tycKKOSwP7Xt6FXLG9h/FgCu45wdGubHtV0=",
+        "lastModified": 1638279546,
+        "narHash": "sha256-1KCwN7twjp1dBdp0jPgVdYFztDkCR8+roo0B34J9oBY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "24528474d2b3370f2f23879a557ae2cc92a5d50b",
+        "rev": "96b4157790fc96e70d6e6c115e3f34bba7be490f",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.05",
+        "ref": "nixos-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c3975cb..e2ea89e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,11 +4,10 @@
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
 
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    # TODO 21.11: Switch to upstream
-    home-manager.url = "github:sbruder/home-manager/release-21.05-neovim-lua";
+    home-manager.url = "github:nix-community/home-manager/release-21.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     krops.url = "github:Mic92/krops";
diff --git a/machines/default.nix b/machines/default.nix
index 81e5de0..e03b3f2 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -38,7 +38,6 @@ in
   };
   yuzuru = {
     system = "x86_64-linux";
-    nixpkgs = inputs.nixpkgs-unstable;
 
     targetHost = "yuzuru.sbruder.xyz";
   };