diff --git a/default.nix b/default.nix
deleted file mode 100644
index 23a3612..0000000
--- a/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  imports = [ ./flake-module.nix ];
-}
diff --git a/flake-module.nix b/flake-module.nix
deleted file mode 100644
index c9fa41a..0000000
--- a/flake-module.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ self, ... }:
-{
-  perSystem = { config, pkgs', self', inputs, system, ... }:
-    let
-      pkgs = import self.inputs.nixpkgs {
-        inherit system;
-      };
-    in
-    {
-      onchain.default = {
-        src = ./.;
-        ghc.version = "ghc925";
-        shell = { };
-        enableBuildChecks = true;
-        extraHackageDeps = [
-          "${self.inputs.plutarch-numeric}"
-          "${self.inputs.plutarch-quickcheck}"
-          "${self.inputs.plutarch-context-builder}"
-          "${self.inputs.liqwid-plutarch-extra}"
-          "${self.inputs.liqwid-script-export}"
-          "${self.inputs.liqwid-script-export.inputs.ply}/ply-core"
-          "${self.inputs.liqwid-script-export.inputs.ply}/ply-plutarch"
-        ];
-      };
-    };
-}
diff --git a/flake.nix b/flake.nix
index 58dc9a3..d4bbc5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
     nixpkgs-latest.url = "github:NixOS/nixpkgs";
 
     liqwid-nix = {
-      url = "github:Liqwid-Labs/liqwid-nix/emiflake/ux-improvements";
+      url = "github:Liqwid-Labs/liqwid-nix/liqwid-nix-2.0";
       inputs.nixpkgs-latest.follows = "nixpkgs-latest";
     };
 
@@ -31,7 +31,33 @@
   outputs = { self, liqwid-nix, flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit self; } {
       imports = liqwid-nix.allModules ++ [
-        ./.
+        ({ self, ... }:
+          {
+            perSystem = { config, pkgs', self', inputs, system, ... }:
+              let
+                pkgs = import self.inputs.nixpkgs {
+                  inherit system;
+                };
+              in
+              {
+                onchain.default = {
+                  src = ./.;
+                  ghc.version = "ghc925";
+                  shell = { };
+                  enableBuildChecks = true;
+                  extraHackageDeps = [
+                    "${self.inputs.plutarch-numeric}"
+                    "${self.inputs.plutarch-quickcheck}"
+                    "${self.inputs.plutarch-context-builder}"
+                    "${self.inputs.liqwid-plutarch-extra}"
+                    "${self.inputs.liqwid-script-export}"
+                    "${self.inputs.liqwid-script-export.inputs.ply}/ply-core"
+                    "${self.inputs.liqwid-script-export.inputs.ply}/ply-plutarch"
+                  ];
+                };
+                ci.required = [ "all_onchain" ];
+              };
+          })
       ];
       systems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" "aarch64-linux" ];
       perSystem = { config, self', inputs', pkgs, system, ... }: { };