diff --git a/src/apps/personal/overlays/hubfs.nix b/src/apps/personal/overlays/hubfs.nix
index ea0fddf..4f92860 100644
--- a/src/apps/personal/overlays/hubfs.nix
+++ b/src/apps/personal/overlays/hubfs.nix
@@ -1,32 +1,21 @@
 final: prev: let
-  version = "1ba013d3fe54de01c52bd74d98037fe4c0029d6e";
-
   src = final.fetchFromGitHub {
     owner = "winfsp";
     repo = "hubfs";
-    rev = version;
+    rev = "1ba013d3fe54de01c52bd74d98037fe4c0029d6e";
     hash = "sha256-R1nCdua0gacXrglQ4AZfxnO3ngVECCKKiUOgp3dWRGg=";
-  };
+  } + "/src";
 in {
-  hubfs = final.stdenv.mkDerivation {
+  hubfs = final.buildGoModule {
     name = "hubfs";
-    inherit src version;
-    rev = version;
-
     buildInputs = with final; [
         fuse
+        fuse3
         fuse-common
-        go
-        gnumake
     ];
-
-    buildPhase = ''
-      make
-    '';
-
-    installPhase = ''
-      mkdir -p $out/bin
-      mv hubfs $out/bin
-    '';
+    checkPhase = ":"; # Bit of a hack here; we need to disable tests as we can't get FUSE inside the build derivation to test the package
+    inherit src;
+    vendorSha256 = "sha256-Fpa+wanlMIqxkEZ3JQdCT4ixuNBj7AquG2+wLuO5TQU=";
+    runVend = true;
   };
 }
diff --git a/src/apps/personal/overlays/hubfs.nix.buildGoModule.borked b/src/apps/personal/overlays/hubfs.nix.buildGoModule.borked
deleted file mode 100644
index 2241d8f..0000000
--- a/src/apps/personal/overlays/hubfs.nix.buildGoModule.borked
+++ /dev/null
@@ -1,19 +0,0 @@
-final: prev: let
-  src = final.fetchFromGitHub {
-    owner = "winfsp";
-    repo = "hubfs";
-    rev = "1ba013d3fe54de01c52bd74d98037fe4c0029d6e";
-    hash = "sha256-R1nCdua0gacXrglQ4AZfxnO3ngVECCKKiUOgp3dWRGg=";
-  } + "/src";
-in {
-  hubfs = final.buildGoModule {
-    name = "hubfs";
-    buildInputs = with final; [
-        fuse
-    ];
-    checkPhase = ":"; # Bit of a hack here; we need to disable tests as we can't get FUSE inside the build derivation to test the package
-    inherit src;
-    vendorSha256 = "sha256-Fpa+wanlMIqxkEZ3JQdCT4ixuNBj7AquG2+wLuO5TQU=";
-    runVend = true;
-  };
-}