diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 93d092b..4a1fa75 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -15,10 +15,6 @@ brew install ansible
 ansible-galaxy install -r ~/.config/yadm/requirements.yml
 ansible-playbook -vv ~/.config/yadm/mac-install.yml -i ~/.config/yadm/inventory --ask-become-pass
 
-# Oh-my-zsh
-# TODO: don't do this, just copy .oh-my-zsh, but because its a submodule we should make a fork
-# yes | sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-
 # Disable sound effects on boot
 sudo nvram StartupMute=%01
 
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..da395f9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".oh-my-zsh"]
+	path = .oh-my-zsh
+	url = https://github.com/ohmyzsh/ohmyzsh.git
diff --git a/.oh-my-zsh b/.oh-my-zsh
new file mode 160000
index 0000000..d59f2fa
--- /dev/null
+++ b/.oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit d59f2fac36ac7d83d33c0054b1de33cce54e3210