diff --git a/default.nix b/default.nix
index c5eb5a4b..484ea464 100644
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,15 @@
 let
-  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  flakeCompat = fetchTarball {
-    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  };
-  kittywitch = import flakeCompat {
-    src = ./.;
+  lockFile = builtins.fromJSON (builtins.readFile ./flake.lock);
+  flake-compat-node = lockFile.nodes.${lockFile.nodes.root.inputs.flake-compat};
+  flake-compat = builtins.fetchTarball {
+    inherit (flake-compat-node.locked) url;
+    sha256 = flake-compat-node.locked.narHash;
   };
+
+  flake = (
+    import flake-compat {
+      src = ./.;
+    }
+  );
 in
-  kittywitch.defaultNix
+  flake.defaultNix
diff --git a/flake.nix b/flake.nix
index 1cdb4961..de3aee97 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@
     };
     # to allow non-nix 2.4 evaluation
     flake-compat = {
-      url = "github:edolstra/flake-compat";
+      url = "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz";
       flake = false;
     };
     rbw-bitw = {