diff --git a/flake.lock b/flake.lock
index fc742252..7cdd16c3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,15 +80,15 @@
         "flake-utils": "flake-utils"
       },
       "locked": {
-        "lastModified": 1616328024,
-        "narHash": "sha256-t5FrJlYiN1HojtN3eRWlPhmzH2+5pdB22AfosbphI6c=",
-        "owner": "gytis-ivaskevicius",
+        "lastModified": 1616582947,
+        "narHash": "sha256-nXJTA78Wk940aF6p6UQCpTLuHVV0tnfJtyDGay+0xMY=",
+        "owner": "chvp",
         "repo": "flake-utils-plus",
-        "rev": "51cb739c9c9c2258bc70747eb7bc22975ae244bd",
+        "rev": "97f6aa2fb92c699057d7199bcf629ad4bc8f4717",
         "type": "github"
       },
       "original": {
-        "owner": "gytis-ivaskevicius",
+        "owner": "chvp",
         "ref": "master",
         "repo": "flake-utils-plus",
         "type": "github"
diff --git a/flake.nix b/flake.nix
index 24a54080..ab623128 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus/master";
+    utils.url = "github:chvp/flake-utils-plus/master";
   };
 
   outputs = inputs@{ self, nixpkgs, emacs-overlay, home-manager, utils }: utils.lib.systemFlake {
@@ -16,12 +16,9 @@
     channels.nixpkgs = {
       input = nixpkgs;
       patches = [ ];
-      # TODO: Try to find a way to get rid of this and return to the
-      # list built up in the config.
-      config = { allowUnfree = true; };
     };
-    sharedOverlays = [ emacs-overlay.overlay ];
     sharedModules = [
+      ({ nixpkgs.overlays = [ emacs-overlay.overlay ]; })
       utils.nixosModules.saneFlakeDefaults
       home-manager.nixosModules.home-manager
       ./modules