diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 0d3698e..258acb1 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -141,11 +141,6 @@ MODE1 is enabled and vice-versa."
   "Set the `disabled' property for each item in FUNCTIONS to nil."
   (mapc #'(lambda (f) (put f 'disabled nil)) functions))
 
-(defun oni:set-keys-for-hy ()
-  "Set some keybindings for `hy-mode'."
-  (local-set-key (kbd "{") #'paredit-open-curly)
-  (local-set-key (kbd "}") #'paredit-close-curly))
-
 (defun oni:set-keys-for-jabber-chat ()
   "Set certain keys for `jabber-chat-mode'."
   (local-set-key (kbd "M-!") #'shell-command-with-command))
@@ -761,7 +756,7 @@ If no direction is given, don't split."
   #'turn-off-auto-fill)
 
 (oni:add-hooks 'hy-mode-hook
-  #'paredit-mode #'oni:set-keys-for-hy)
+  #'paredit-mode 'oni:set-keys-for-hy)
 
 (oni:add-hooks 'ielm-mode-hook
   #'paredit-mode #'eldoc-mode 'oni:set-emacs-lisp-keys)
diff --git a/emacs/.emacs.d/site-lisp/oni-hy.el b/emacs/.emacs.d/site-lisp/oni-hy.el
new file mode 100644
index 0000000..7c2d2ca
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-hy.el
@@ -0,0 +1,37 @@
+;;; oni-hy.el --- Extra functions and commands for Hy  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Here are some extra commands and functions for programming in Hy.
+
+;;; Code:
+
+(require 'hy-mode)
+(require 'paredit)
+
+;;;###autoload
+(defun oni:set-keys-for-hy ()
+  "Set some keybindings for `hy-mode'."
+  (define-key hy-mode-map (kbd "{") #'paredit-open-curly)
+  (define-key hy-mode-map (kbd "}") #'paredit-close-curly))
+
+(provide 'oni-hy)
+;;; oni-hy.el ends here