diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f84d63e..3465f6e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Build Docker Image
         run: |
           nix build --accept-flake-config --print-build-logs
-          cp -v "$(realpath result)" lix-image.tar.gz
+          cp -v "$(realpath result/image.tar.gz)" lix-image.tar.gz
       - name: Archive production artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -47,8 +47,9 @@ jobs:
       - name: Push docker image
         run: |
           docker load <lix-image.tar.gz
-          docker login --username "${{ github.actor }}" --password "${{ secrets.GITHUB_TOKEN }}" "$REGISTRY"
-          docker image tag nix:latest "$REGISTRY/$IMAGE_NAME:latest"
+          docker image list
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login --username "${{ github.actor }}" --password-stdin "$REGISTRY"
+          docker image tag nix:2.90.0-beta.1 "$REGISTRY/$IMAGE_NAME:latest"
           docker push "$REGISTRY/$IMAGE_NAME:latest"
   lockfile:
     runs-on: ubuntu-22.04
diff --git a/flake.lock b/flake.lock
index c6838b8..5f4bb1c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,38 +1,79 @@
 {
   "nodes": {
-    "lix": {
+    "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1715969825,
-        "narHash": "sha256-1ixH9o+F8er3fD2G4/lqp1KkxXLCbUxveCsXf8jgZX0=",
-        "rev": "93b7edfd077e056f9deb7656be796ea49a162f51",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "lix": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-regression": [],
+        "pre-commit-hooks": "pre-commit-hooks"
+      },
+      "locked": {
+        "lastModified": 1714955862,
+        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
+        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/93b7edfd077e056f9deb7656be796ea49a162f51.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b6799ab0374a8e1907a48915d3187e07da41d88c.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.90-beta.1.tar.gz"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715787315,
-        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
+        "lastModified": 1715986924,
+        "narHash": "sha256-2MGVlPSZaZOW0n89mIR8yEe3wZS9cpGungPPK0W0wq8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
+        "rev": "4ee692eace12dc82f7c4a0df9009fd352dd26665",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-23.11-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712055707,
+        "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
       }
     },
     "root": {
       "inputs": {
         "lix": "lix",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "lix",
+          "nixpkgs"
+        ],
         "systems": "systems"
       }
     },
diff --git a/flake.nix b/flake.nix
index c70ba25..07d344c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
   description = "A starting point for your devshell";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.follows = "lix/nixpkgs";
     systems.url = "github:nix-systems/default";
     lix = {
-      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-      flake = false;
+      url = "https://git.lix.systems/lix-project/lix/archive/2.90-beta.1.tar.gz";
+      inputs.nixpkgs-regression.follows = "";
     };
   };
 
@@ -24,29 +24,27 @@
     nixpkgs,
     systems,
     lix,
-    ...
   }: let
-    lixImage = pkgs: pkgs.callPackage (import (lix + "/docker.nix")) {inherit pkgs;};
+    lixImage = system: lix.packages.${system}.dockerImage;
     allSystems = import systems;
-    forEachSystem = f:
-      nixpkgs.lib.genAttrs allSystems (system:
-        f {
-          inherit system;
-          pkgs = nixpkgs.legacyPackages.${system};
-        });
+    forEachSystem = nixpkgs.lib.genAttrs allSystems;
+    nixpkgsFor = forEachSystem (system:
+      import nixpkgs {
+        inherit system;
+        overlays = [lix.overlays.default];
+      });
   in {
     # Nix code formatter; I like alejandra, but nixpkgsfmt, nixfmt-classic, and nixfmt-rfc-style also exist
-    formatter = forEachSystem ({pkgs, ...}: pkgs.alejandra);
+    formatter = forEachSystem (system: nixpkgsFor.${system}.alejandra);
     # Packages exported by this flake
-    packages = forEachSystem ({
-      pkgs,
-      system,
-    }: {
+    packages = forEachSystem (system: {
       default = self.packages.${system}.lixImage;
-      lixImage = lixImage pkgs;
+      lixImage = lixImage system;
     });
-    devShells = forEachSystem ({pkgs, ...}: {
-      default = pkgs.mkShell {packages = [];};
+    devShells = forEachSystem (system: let
+      pkgs = nixpkgsFor.${system};
+    in {
+      default = pkgs.mkShellNoCC {packages = [];};
     });
   };
 }