             '("* TODO %?\n%U\n\n%i" :empty-lines 1))))
 
 (defun org/init-ox-gfm ()
-  ;; installing this package from melpa is buggy,
-  ;; so we install it as an extension for now.
-  (use-package ox-gfm
-    :if org-enable-github-support
-    :defer t
-    :init
-    (progn
-      ;; seems to be required otherwise the extension is not
-      ;; loaded properly by org
-      (with-eval-after-load 'org (require 'ox-gfm))
-      (autoload 'org-gfm-export-as-markdown "ox-gfm" "\
+  (spacemacs|use-package-add-hook org :post-config (require 'ox-gfm))
+  (autoload 'org-gfm-export-as-markdown "ox-gfm" "\
  Export current buffer to a Github Flavored Markdown buffer.
 
 If narrowing is active in the current buffer, only export its

    org-pomodoro
    org-present
    org-repo-todo
    (ox-gfm :location local)
    (ox-reveal :toggle org-enable-reveal-js-support)
    persp-mode
    ))

    :binding "o"
    :body
    (find-file (first (org-agenda-files)))))
