diff --git a/manifests/configz-user.lua b/manifests/configz-user.lua
index e60c585..93863cc 100644
--- a/manifests/configz-user.lua
+++ b/manifests/configz-user.lua
@@ -1,3 +1,4 @@
+require "modules.bin"
 require "modules.clojure"
 require "modules.lua-lsp"
 require "modules.nvim"
diff --git a/manifests/workstation.pp b/manifests/workstation.pp
index a39f10f..f7df698 100644
--- a/manifests/workstation.pp
+++ b/manifests/workstation.pp
@@ -16,8 +16,6 @@ node default {
   # Set up core components
   #
   include core::git
-  include core::zsh
-  include core::bin
   include core::fonts
   include core::emacs
   include core::terminal
diff --git a/modules/bin.lua b/modules/bin.lua
new file mode 100644
index 0000000..d77b7af
--- /dev/null
+++ b/modules/bin.lua
@@ -0,0 +1,3 @@
+-- Links all of the bin files into `~/.local/bin`
+configz.directory(os.getenv("HOME") .. "/.local/bin")
+configz.run(string.format("ln -sf %s/site-modules/core/files/bin/* %s/.local/bin", os.getenv "PWD", os.getenv "HOME"))
diff --git a/site-modules/core/manifests/bin.pp b/site-modules/core/manifests/bin.pp
deleted file mode 100644
index e251230..0000000
--- a/site-modules/core/manifests/bin.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Links all of the bin files into `~/.local/bin`
-#
-# Author  Ade Attwood <code@adeattwood.co.uk>
-# Updated 2018-07-16
-#
-
-class core::bin {
-  file { "${user_home}/.local/bin":
-    ensure => 'directory',
-    owner  => $user,
-  }
-
-  exec { 'Link bin files':
-    path    => '/usr/bin:/usr/sbin:/bin',
-    command => "mkdir -p ${user_home}/.local/bin \
-      && ln -sf ${find_file('core/bin')}/* ${user_home}/.local/bin/",
-  }
-}