diff --git a/flake.lock b/flake.lock
index cb5bc76..6971800 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,17 +45,24 @@
       }
     },
     "comma": {
-      "flake": false,
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "naersk": "naersk",
+        "nixpkgs": [
+          "nixpkgs-release"
+        ],
+        "utils": "utils"
+      },
       "locked": {
         "lastModified": 1650481854,
         "narHash": "sha256-CZQLigKovJbMoTbPuWT3SBSMymjD58m72O/oy+HilQg=",
-        "owner": "Shopify",
+        "owner": "nix-community",
         "repo": "comma",
         "rev": "034a9ca440370fc1eccbed43ff345fb6ea1f0d27",
         "type": "github"
       },
       "original": {
-        "owner": "Shopify",
+        "owner": "nix-community",
         "repo": "comma",
         "type": "github"
       }
@@ -82,6 +89,22 @@
         "url": "https://git.bytes.zone/brian/elo-anything.git"
       }
     },
+    "flake-compat": {
+      "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-utils": {
       "locked": {
         "lastModified": 1631561581,
@@ -159,6 +182,28 @@
         "type": "github"
       }
     },
+    "naersk": {
+      "inputs": {
+        "nixpkgs": [
+          "comma",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1650101877,
+        "narHash": "sha256-IYxYc5Z1ZHQDTQbTWsOZ9HlZepsVjgV5oZwmbKzxSJs=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "8cc379478819e6a22ce7595a761fe1e17c8d7458",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "nates-mazes": {
       "inputs": {
         "flake-utils": "flake-utils_4",
@@ -224,6 +269,21 @@
         "repo": "sysz",
         "type": "github"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 27bde8a..d7d933f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +12,8 @@
       "git+https://git.bytes.zone/bytes.zone/bytes.zone.git?ref=main";
     bytes-zone.inputs.nixpkgs.follows = "nixpkgs-release";
 
-    comma = {
-      url = "github:Shopify/comma";
-      flake = false;
-    };
+    comma.url = "github:nix-community/comma";
+    comma.inputs.nixpkgs.follows = "nixpkgs-release";
 
     elo-anything.url =
       "git+https://git.bytes.zone/brian/elo-anything.git?ref=main";
@@ -46,7 +44,7 @@
           inputs.elo-anything.overlay.${system}
           inputs.nates-mazes.overlay.${system}
           (final: prev: {
-            comma = pkgs.callPackage inputs.comma { };
+            comma = inputs.comma.packages.${system}.default;
 
             goatcounter = pkgs.buildGoModule {
               pname = "goatcounter";