diff --git a/flake.lock b/flake.lock
index 140789f..119d99f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725983898,
-        "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e2dd0ea..9bdf772 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,24 +17,16 @@
             overrides = hfinal: hprev: {
               # Internal Packages
               xmonad-config = hfinal.callCabal2nix "xmonad-config" ./. {};
-              xmonad-contrib = pkgs.haskell.lib.compose.doJailbreak (pkgs.haskell.lib.compose.overrideCabal (drv: {
-                  version = "0.18.1";
-                  sha256 = "sha256-BXOdIErNhNNS3slNBhiskH/zljVREjx0fu836BOGZDI=";
-                })
-                hprev.xmonad-contrib);
-              xmonad-extras = pkgs.haskell.lib.compose.doJailbreak (pkgs.haskell.lib.compose.overrideCabal (drv: {
-                  version = "0.17.2";
-                  sha256 = "sha256-KAqC6sDbvd79lhyByfbA0cYwSINJ+JkivsieUE2rm2U=";
-                })
-                hprev.xmonad-extras);
+              xmonad = hprev.xmonad_0_18_0;
+              xmonad-contrib = hprev.xmonad-contrib_0_18_1;
             };
           };
         });
   in {
     formatter = forAllSystems ({pkgs, ...}: pkgs.alejandra);
-    packages = forAllSystems ({hsPkgs, ...}: ({
+    packages = forAllSystems ({hsPkgs, ...}: {
       default = hsPkgs.xmonad-config;
-    }));
+    });
     devShells = forAllSystems ({
       hsPkgs,
       pkgs,