diff --git a/flake.lock b/flake.lock
index 0aebba9e..f3d037ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1630746807,
-        "narHash": "sha256-l30gDY9EQbaTaXTehjLgmnGeCUL0sGpD+KsI2WnCsdI=",
+        "lastModified": 1630893136,
+        "narHash": "sha256-TwySlmIjvgHEHx2xllpDeY4Xrg7sEPi076t6y+kXfu8=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "77da5f7db124ac4e9c0d1228647f20c01e5498f9",
+        "rev": "08398463502a50dab640e64c5cfb39ef29545c3c",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1618217525,
-        "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
+        "lastModified": 1629481132,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544",
+        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1630428740,
-        "narHash": "sha256-394yJxkFjvg47vB0jK5WHCitLDilyGjO3HpuZkAM2GA=",
+        "lastModified": 1630890028,
+        "narHash": "sha256-Q2ZuK0QQiSdgei68a6wV1FDPmBkR6M0apFjQrWsv8FY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "21a2ff449620a9cb91802f9d1a9157b2ae8c6b39",
+        "rev": "5e46262cb1fa888f6f46a675cc2806a23ba9625c",
         "type": "github"
       },
       "original": {
@@ -92,11 +92,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1630338749,
-        "narHash": "sha256-J1LsmwGtlYpqIMYEi/amMKkk0VfRrwHaEs/uylugGnE=",
+        "lastModified": 1630850248,
+        "narHash": "sha256-OzJi6Olf7mSVhGt3W7qOMVP5Qk1lH60zlHeCcITzfv0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a2ec31e224de9461390cdd03e5e0b0290cdad0b",
+        "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4",
         "type": "github"
       },
       "original": {
@@ -121,15 +121,16 @@
         "flake-utils": "flake-utils"
       },
       "locked": {
-        "lastModified": 1619358717,
-        "narHash": "sha256-FkEOIW82ClvUBtD8aqPediM8FERldsOyjPIyapVa65I=",
+        "lastModified": 1630860081,
+        "narHash": "sha256-hGkbmh9eCGpj/6kMSnaU02U6HDfUkDgZqB5nm26OPX4=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "e7ae270a23695b50fbb6b72759a7fb1e3340ca86",
+        "rev": "231acaa2cb0fc83d294f8f04352f87f9caa2b14a",
         "type": "github"
       },
       "original": {
         "owner": "gytis-ivaskevicius",
+        "ref": "1.2.0",
         "repo": "flake-utils-plus",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 37f0b31b..91372b20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
+    utils.url = "github:gytis-ivaskevicius/flake-utils-plus/1.2.0";
   };
 
   outputs = inputs@{ self, nixpkgs, accentor, agenix, emacs-overlay, home-manager, utils }:
@@ -66,16 +66,15 @@
         lasting-integrity.modules = [ ./machines/lasting-integrity ];
         urithiru.modules = [ ./machines/urithiru ];
       };
-      devShellBuilder = channels:
-        let pkgs = channels.nixpkgs; in
-        pkgs.mkShell {
+      outputsBuilder = channels: let pkgs = channels.nixpkgs; in {
+        packages = customPackages pkgs.callPackage;
+        devShell = pkgs.mkShell {
           buildInputs = [
             pkgs.nixpkgs-fmt
             (pkgs.writeShellScriptBin "fetchpatch" "curl -L https://github.com/NixOS/nixpkgs/pull/$1.patch -o patches/$1.patch")
             agenix.defaultPackage.x86_64-linux
           ];
         };
-      packagesBuilder = channels:
-        let pkgs = channels.nixpkgs; in customPackages pkgs.callPackage;
+      };
     };
 }
diff --git a/patches/136864.patch b/patches/136864.patch
new file mode 100644
index 00000000..c1c11a6b
--- /dev/null
+++ b/patches/136864.patch
@@ -0,0 +1,29 @@
+From d4a0f34cceacfea469355550379f0bae8e9e6fbc Mon Sep 17 00:00:00 2001
+From: Charlotte Van Petegem <charlotte@vanpetegem.me>
+Date: Mon, 6 Sep 2021 09:43:15 +0200
+Subject: [PATCH] mu: 1.6.5 -> 1.6.6
+
+---
+ pkgs/tools/networking/mu/default.nix | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
+index db8f9bdb9d1a52..4b9efdc24a6011 100644
+--- a/pkgs/tools/networking/mu/default.nix
++++ b/pkgs/tools/networking/mu/default.nix
+@@ -7,13 +7,13 @@
+ 
+ stdenv.mkDerivation rec {
+   pname = "mu";
+-  version = "1.6.5";
++  version = "1.6.6";
+ 
+   src = fetchFromGitHub {
+     owner  = "djcb";
+     repo   = "mu";
+     rev    = version;
+-    sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ=";
++    sha256 = "64TfXPz1NCGKnozI9j+yog+hln1rA/qpzCLvPNSvH+c=";
+   };
+ 
+   postPatch = lib.optionalString (batchSize != null) ''