diff --git a/flake.lock b/flake.lock
index 37d354f..839619e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -20,27 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695298503,
-        "narHash": "sha256-eDuN/+479v5gfVqwmJRYVX/Skh+TYSifAXdJ9xMqiP4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b1370f72c01cee73c8648baf158453d60f3127e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1691006197,
-        "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=",
+        "lastModified": 1707268954,
+        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
         "owner": "lopsided98",
         "repo": "nixpkgs",
-        "rev": "66aedfd010204949cb225cf749be08cb13ce1813",
+        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
         "type": "github"
       },
       "original": {
@@ -56,21 +40,24 @@
           "ros-flake",
           "flake-utils"
         ],
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "ros-flake",
+          "nixpkgs"
+        ],
         "ros-flake": "ros-flake"
       }
     },
     "ros-flake": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1694916346,
-        "narHash": "sha256-3Fb5sRqFhpIVCK8hH0dtRNyJHV7zvVavZEbTGZWNy4g=",
+        "lastModified": 1707588628,
+        "narHash": "sha256-2suIXkfQrOtPeLanj9IE/LD8gLe8oBwOUXeG8pbJrEA=",
         "owner": "lopsided98",
         "repo": "nix-ros-overlay",
-        "rev": "148dc07305802c41369839fb2d4d5291571ddb69",
+        "rev": "9f53d85d2a20447f67048a85e5e79e8753dce327",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c26db7c..9ddb038 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Robossembler Development Environments on Nix";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=master";
+    nixpkgs.follows = "ros-flake/nixpkgs";
     flake-utils.follows = "ros-flake/flake-utils";
     ros-flake.url = "github:lopsided98/nix-ros-overlay?ref=develop";
   };