diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5bcd749..e9d865e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -33,9 +33,8 @@ jobs:
         with:
           name: aciceri-fleet
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      #- run: sed -i 's/#\(.*\).*\#.* ga-uncomment/\1/g' flake.nix # disabling outputs unsupported inside the GitHub action
-      - run: nix -Lv build ".#nixosConfigurations.pbp.config.system.build.toplevel"
-      #- run: nix -Lv flake check
-      #- run: nix -Lv build ".#nixosConfigurations.pc.config.system.build.toplevel"
-      #- run: nix -Lv build ".#nixosConfigurations.hs.config.system.build.toplevel"
+      - run: sed -i 's/#\(.*\).*\#.* ga-uncomment/\1/g' flake.nix # disabling outputs unsupported inside the GitHub action
+      - run: nix -Lv flake check
+      - run: nix -Lv build ".#nixosConfigurations.pc.config.system.build.toplevel"
+      - run: nix -Lv build ".#nixosConfigurations.hs.config.system.build.toplevel"
       - run: nix -Lv develop -c echo OK
diff --git a/ci.nix b/ci.nix
deleted file mode 100644
index 5aab5a2..0000000
--- a/ci.nix
+++ /dev/null
@@ -1 +0,0 @@
-(import ./flake-compat.nix).defaultNix.ciNix
diff --git a/flake-compat.nix b/flake-compat.nix
deleted file mode 100644
index dab420b..0000000
--- a/flake-compat.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-let
-  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  inherit (lock.nodes.flake-compat.locked) owner repo rev narHash;
-  flake-compat = builtins.fetchTarball {
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-    sha256 = narHash;
-  };
-in
-import flake-compat { src = ./.; }
diff --git a/flake.lock b/flake.lock
index 09c9f95..45dc7a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -136,21 +136,6 @@
         "type": "github"
       }
     },
-    "flake-compat-ci": {
-      "locked": {
-        "lastModified": 1646664117,
-        "narHash": "sha256-AX2VewPcS9eRsoirVHfnk07MHAOH6CTDiD10XtRaZbk=",
-        "owner": "hercules-ci",
-        "repo": "flake-compat-ci",
-        "rev": "e588637b2eec4261ed0d36335c83a117f2744dea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-compat-ci",
-        "type": "github"
-      }
-    },
     "flake-compat_2": {
       "flake": false,
       "locked": {
@@ -168,22 +153,6 @@
       }
     },
     "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1641205782,
@@ -305,15 +274,15 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1648832826,
-        "narHash": "sha256-kChwsBHBaSCtlqUNtgI8RmqpesyvAT7iC4WWkH3SJow=",
-        "owner": "aciceri",
+        "lastModified": 1649849514,
+        "narHash": "sha256-zQyTr2UebTKUh1KLyLtevhHsM8umPK1LfQLGUGjRjiQ=",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "06526f5c0c55235bd0301f4cdb1867f09bc5b56e",
+        "rev": "1a0ccdbf4583ed0fce37eea7955e8ef90f840a9f",
         "type": "github"
       },
       "original": {
-        "owner": "aciceri",
+        "owner": "NixOS",
         "repo": "nixos-hardware",
         "type": "github"
       }
@@ -339,7 +308,7 @@
         "cachix": [
           "unstable"
         ],
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "unstable"
         ]
@@ -429,8 +398,6 @@
         ],
         "digga": "digga",
         "emacs-overlay": "emacs-overlay",
-        "flake-compat": "flake-compat_3",
-        "flake-compat-ci": "flake-compat-ci",
         "home": "home",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs-wayland": "nixpkgs-wayland",
diff --git a/flake.nix b/flake.nix
index ce727f9..e426de9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,41 +3,29 @@
 
   inputs =
     {
-      stable.url = "github:nixos/nixpkgs/release-21.11";
-      unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+      stable.url = github:nixos/nixpkgs/release-21.11;
+      unstable.url = github:nixos/nixpkgs/nixos-unstable;
 
-      nur.url = "github:nix-community/NUR";
+      nur.url = github:nix-community/NUR;
 
-      digga.url = "github:divnix/digga";
+      digga.url = github:divnix/digga;
       digga.inputs.nixpkgs.follows = "unstable";
       digga.inputs.nixlib.follows = "unstable";
       digga.inputs.home-manager.follows = "unstable";
 
-      flake-compat = {
-        url = "github:edolstra/flake-compat";
-        flake = false;
-      };
-      flake-compat-ci.url = github:hercules-ci/flake-compat-ci;
-
-      home.url = "github:nix-community/home-manager/release-21.11";
+      home.url = github:nix-community/home-manager/release-21.11;
       home.inputs.nixpkgs.follows = "unstable";
 
-      darwin.url = "github:LnL7/nix-darwin";
+      darwin.url = github:LnL7/nix-darwin;
       darwin.inputs.nixpkgs.follows = "stable";
 
       deploy.follows = "digga/deploy";
 
       emacs-overlay.url = github:nix-community/emacs-overlay/beffadfb0345078ab3d630e9ca6e0aaf061d3aa5;
 
-      nixos-hardware.url = github:aciceri/nixos-hardware;
+      nixos-hardware.url = github:NixOS/nixos-hardware;
 
-      # pinebook-pro = {
-      #   url = "github:samueldr/wip-pinebook-pro/995a6859f3eb4d740dbc086150dee8f98175a3b6";
-      #   flake = false;
-      # };
-      # pinebook-pro-kernel-latest.url = github:nixos/nixpkgs/755db9a1e9a35c185f7d6c0463025e94ef44622e;
-
-      nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
+      nixpkgs-wayland.url = github:nix-community/nixpkgs-wayland;
       nixpkgs-wayland.inputs.nixpkgs.follows = "unstable";
       nixpkgs-wayland.inputs.cachix.follows = "unstable";
     };
@@ -45,13 +33,10 @@
   outputs =
     { self
     , digga
-    , flake-compat-ci
     , unstable
     , home
     , nixos-hardware
     , darwin
-      # , pinebook-pro
-      # , pinebook-pro-kernel-latest
     , nixpkgs-wayland
     , emacs-overlay
     , nur
@@ -141,9 +126,6 @@
             suites = with profiles; rec {
               base = [ core users.ccr users.root ];
             };
-            # unstableKernelForPBP = (import inputs.unstable {
-            #   system = "aarch64-linux";
-            # }).pkgs.linuxPackages_latest;
           };
         };
 
@@ -184,12 +166,5 @@
           inherit emacs-overlay; unstablePkgsInput = inputs.unstablePkgs;
         };
       };
-
-      ciNix = flake-compat-ci.lib.recurseIntoFlakeWith {
-        flake = self;
-        systems = [ "x86_64-linux" ];
-      };
-
-
     };
 }