diff --git a/fedireads/books_manager.py b/fedireads/books_manager.py
index fcaf65704..915d95cc6 100644
--- a/fedireads/books_manager.py
+++ b/fedireads/books_manager.py
@@ -8,9 +8,9 @@ from fedireads.connectors.settings import CONNECTORS
 def get_or_create_book(key):
     ''' pull up a book record by whatever means possible '''
     try:
-        book = models.Book.objects.get(
-            openlibrary_key=key
-        ).select_subclasses()
+        book = models.Book.objects.select_subclasses().get(
+            local_key=key
+        )
         return book
     except models.Book.DoesNotExist:
         pass
diff --git a/fedireads/migrations/0020_auto_20200327_2201.py b/fedireads/migrations/0020_auto_20200327_2236.py
similarity index 97%
rename from fedireads/migrations/0020_auto_20200327_2201.py
rename to fedireads/migrations/0020_auto_20200327_2236.py
index 89f45fbed..7292e34cf 100644
--- a/fedireads/migrations/0020_auto_20200327_2201.py
+++ b/fedireads/migrations/0020_auto_20200327_2236.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2020-03-27 22:01
+# Generated by Django 3.0.3 on 2020-03-27 22:36
 
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/fedireads/models/book.py b/fedireads/models/book.py
index 94e522b21..9edf59336 100644
--- a/fedireads/models/book.py
+++ b/fedireads/models/book.py
@@ -1,6 +1,7 @@
 ''' database schema for books and shelves '''
 from datetime import datetime
 from django.db import models
+from model_utils.managers import InheritanceManager
 from uuid import uuid4
 
 from fedireads.settings import DOMAIN
@@ -66,6 +67,7 @@ class Book(FedireadsModel):
     )
     # TODO: why can't I just call this work????
     parent_work = models.ForeignKey('Work', on_delete=models.PROTECT, null=True)
+    objects = InheritanceManager()
 
     @property
     def absolute_id(self):
diff --git a/fedireads/outgoing.py b/fedireads/outgoing.py
index 9817c4bc5..f204888b7 100644
--- a/fedireads/outgoing.py
+++ b/fedireads/outgoing.py
@@ -232,7 +232,7 @@ def handle_tag(user, book, name):
 
 def handle_untag(user, book, name):
     ''' tag a book '''
-    book = models.Book.objects.get(openlibrary_key=book)
+    book = models.Book.objects.get(local_key=book)
     tag = models.Tag.objects.get(name=name, book=book, user=user)
     tag_activity = activitypub.get_remove_tag(tag)
     tag.delete()
diff --git a/fedireads/templates/book.html b/fedireads/templates/book.html
index 257761818..74777a19b 100644
--- a/fedireads/templates/book.html
+++ b/fedireads/templates/book.html
@@ -5,7 +5,7 @@
     <h2><q>{{ book.title }}</q> by
         {% include 'snippets/authors.html' with book=book %}</h2>
     <div>
-        {% if book.parent_work %}<p>Edition of <a href="/book/{{ book.parent_work.openlibrary_key }}">{{ book.parent_work.title }}</a></p>{% endif %}
+        {% if book.parent_work %}<p>Edition of <a href="/book/{{ book.parent_work.local_key }}">{{ book.parent_work.title }}</a></p>{% endif %}
         <div class="book-preview">
 
             {% include 'snippets/book_cover.html' with book=book size=large %}
@@ -32,7 +32,7 @@
     <h2>Leave a review</h2>
     <form class="review-form" name="review" action="/review/" method="post">
         {% csrf_token %}
-        <input type="hidden" name="book" value="{{ book.openlibrary_key }}"></input>
+        <input type="hidden" name="book" value="{{ book.local_key }}"></input>
         {{ review_form.as_p }}
         <button type="submit">Post review</button>
     </form>
diff --git a/fedireads/templates/snippets/authors.html b/fedireads/templates/snippets/authors.html
index 1d619153b..e45a19a5f 100644
--- a/fedireads/templates/snippets/authors.html
+++ b/fedireads/templates/snippets/authors.html
@@ -1 +1 @@
-<a href="/author/{{ book.authors.first.openlibrary_key }}" class="author">{{ book.authors.first.name }}</a>
+<a href="/author/{{ book.authors.first.local_key }}" class="author">{{ book.authors.first.name }}</a>
diff --git a/fedireads/templates/snippets/book.html b/fedireads/templates/snippets/book.html
index ce960a8e4..dad89603a 100644
--- a/fedireads/templates/snippets/book.html
+++ b/fedireads/templates/snippets/book.html
@@ -1,7 +1,7 @@
 {% load fr_display %}
 {% include 'snippets/book_cover.html' with book=book %}
 <p class="title">
-    <a href="/book/{{ book.openlibrary_key }}">{{ book.title }}</a>
+    <a href="/book/{{ book.local_key }}">{{ book.title }}</a>
 </p>
 <p>
     by {% include 'snippets/authors.html' with book=book %}
diff --git a/fedireads/templates/snippets/create_status.html b/fedireads/templates/snippets/create_status.html
index 8206e768f..bd3efbcf7 100644
--- a/fedireads/templates/snippets/create_status.html
+++ b/fedireads/templates/snippets/create_status.html
@@ -4,7 +4,7 @@
 <h2>
     {% include 'snippets/avatar.html' with user=user %}
     Your thoughts on
-    <a href="/book/{{ book.openlibrary_key }}">{{ book.title }}</a>
+    <a href="/book/{{ book.local_key }}">{{ book.title }}</a>
     by {% include 'snippets/authors.html' with book=book %}
 </h2>
 
@@ -24,16 +24,14 @@
     {% include 'snippets/book_cover.html' with book=book %}
     <form class="tab-option-{{ book.id }} review-form" name="review" action="/review/" method="post" id="tab-review-{{ book.id }}">
         {% csrf_token %}
-        {# todo: this shouldn't use the openlibrary key #}
-        <input type="hidden" name="book" value="{{ book.openlibrary_key }}"></input>
+        <input type="hidden" name="book" value="{{ book.local_key }}"></input>
         {{ review_form.as_p }}
         <button type="submit">post review</button>
     </form>
 
     <form class="hidden tab-option-{{ book.id }} review-form" name="comment" action="/comment/" method="post" id="tab-comment-{{ book.id }}">
         {% csrf_token %}
-        {# todo: this shouldn't use the openlibrary key #}
-        <input type="hidden" name="book" value="{{ book.openlibrary_key }}"></input>
+        <input type="hidden" name="book" value="{{ book.local_key }}"></input>
         {{ comment_form.as_p }}
         <button type="submit">post comment</button>
     </form>
diff --git a/fedireads/templates/snippets/shelf.html b/fedireads/templates/snippets/shelf.html
index b18967e72..e0975a487 100644
--- a/fedireads/templates/snippets/shelf.html
+++ b/fedireads/templates/snippets/shelf.html
@@ -33,7 +33,7 @@
         {% include 'snippets/book_cover.html' with book=book size="small" %}
     </td>
     <td>
-        <a href="/book/{{ book.openlibrary_key }}">{{ book.title }}</a>
+        <a href="/book/{{ book.local_key }}">{{ book.title }}</a>
     </td>
     <td>
         {{ book.authors.first.name }}
@@ -45,7 +45,7 @@
         {{ book.created_date | naturalday }}
     </td>
     <td>
-        <a href="https://openlibrary.org{{ book.key }}" target="_blank">OpenLibrary</a>
+        <a href="https://openlibrary.org/book/{{ book.openlibrary_key }}" target="_blank">OpenLibrary</a>
     </td>
     {% if ratings %}
     <td>
diff --git a/fedireads/templates/snippets/tag.html b/fedireads/templates/snippets/tag.html
index 48822a929..14d6f1029 100644
--- a/fedireads/templates/snippets/tag.html
+++ b/fedireads/templates/snippets/tag.html
@@ -3,14 +3,14 @@
     {% if tag.identifier in user_tags %}
     <form class="tag-form" name="tag" action="/untag/" method="post">
         {% csrf_token %}
-        <input type="hidden" name="book" value="{{ book.openlibrary_key }}"></input>
+        <input type="hidden" name="book" value="{{ book.local_key }}"></input>
         <input type="hidden" name="name" value="{{ tag.name }}"></input>
         <button type="submit">x</button>
     </form>
     {% else %}
     <form class="tag-form" name="tag" action="/tag/" method="post">
         {% csrf_token %}
-        <input type="hidden" name="book" value="{{ book.openlibrary_key }}"></input>
+        <input type="hidden" name="book" value="{{ book.local_key }}"></input>
         <input type="hidden" name="name" value="{{ tag.name }}"></input>
         <button type="submit">+</button>
     </form>
diff --git a/fedireads/urls.py b/fedireads/urls.py
index 10761e866..fc054ed23 100644
--- a/fedireads/urls.py
+++ b/fedireads/urls.py
@@ -56,8 +56,8 @@ urlpatterns = [
     re_path(r'%s/replies\.json$' % status_path, views.replies_page),
 
     # books
-    re_path(r'^book/(?P<book_identifier>\w+)/?$', views.book_page),
-    re_path(r'^book/(?P<book_identifier>\w+)/(?P<tab>friends|local|federated)?$', views.book_page),
+    re_path(r'^book/(?P<book_identifier>[\w\-]+)/?$', views.book_page),
+    re_path(r'^book/(?P<book_identifier>[\w\-]+)/(?P<tab>friends|local|federated)?$', views.book_page),
     re_path(r'^author/(?P<author_identifier>\w+)/?$', views.author_page),
     re_path(r'^tag/(?P<tag_id>.+)/?$', views.tag_page),
     re_path(r'^shelf/%s/(?P<shelf_identifier>[\w-]+)/?$' % username_regex, views.shelf_page),
diff --git a/fedireads/views.py b/fedireads/views.py
index 7d9d6e99d..f94c3df19 100644
--- a/fedireads/views.py
+++ b/fedireads/views.py
@@ -100,7 +100,9 @@ def books_page(request):
     ''' discover books '''
     recent_books = models.Book.objects
     if request.user.is_authenticated:
-        recent_books = recent_books.filter(~Q(shelfbook__shelf__user=request.user))
+        recent_books = recent_books.filter(
+            ~Q(shelfbook__shelf__user=request.user)
+        )
     recent_books = recent_books.order_by('-created_date')[:50]
 
     data = {
diff --git a/init_db.py b/init_db.py
index d7e3c3b1f..2d6f2d94d 100644
--- a/init_db.py
+++ b/init_db.py
@@ -15,7 +15,7 @@ Connector.objects.create(
     base_url='https://openlibrary.org',
     covers_url='https://covers.openlibrary.org',
     search_url='https://openlibrary.org/search?q=',
-    key_name='olkey',
+    key_name='openlibrary_key',
 )