diff --git a/Gemfile b/Gemfile
index 56a8a659..440f2e87 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 ruby '2.3.1'
 
-gem 'rails', '~> 5.0.1.0'
+gem 'rails', '~> 5.0.2'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index c8a5991d..3ad53537 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_record_query_trace (1.5.3)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activesupport (5.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -114,7 +114,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorize (0.8.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -233,8 +233,8 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.0.1)
-    nio4r (1.2.1)
-    nokogiri (1.7.0.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     oj (2.17.3)
     orm_adapter (0.5.0)
@@ -276,17 +276,17 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-timeout (0.4.2)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
+      railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
@@ -300,9 +300,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -436,7 +436,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     will_paginate (3.1.0)
@@ -494,7 +494,7 @@ DEPENDENCIES
   rack-attack
   rack-cors
   rack-timeout
-  rails (~> 5.0.1.0)
+  rails (~> 5.0.2)
   rails-settings-cached
   rails_12factor
   react-rails
diff --git a/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb b/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
new file mode 100644
index 00000000..16b5db7d
--- /dev/null
+++ b/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
@@ -0,0 +1,15 @@
+class ChangePrimaryKeyToBigintOnStatuses < ActiveRecord::Migration[5.0]
+  def change
+    change_column :statuses, :id, :bigint
+    change_column :statuses, :reblog_of_id, :bigint
+    change_column :statuses, :in_reply_to_id, :bigint
+
+    change_column :media_attachments, :status_id, :bigint
+    change_column :mentions, :status_id, :bigint
+    change_column :notifications, :activity_id, :bigint
+    change_column :preview_cards, :status_id, :bigint
+    change_column :reports, :status_ids, :bigint, array: true
+    change_column :statuses_tags, :status_id, :bigint
+    change_column :stream_entries, :activity_id, :bigint
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3ace2e32..44b52c22 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170322021028) do
+ActiveRecord::Schema.define(version: 20170322143850) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -91,7 +91,7 @@ ActiveRecord::Schema.define(version: 20170322021028) do
   end
 
   create_table "media_attachments", force: :cascade do |t|
-    t.integer  "status_id"
+    t.bigint   "status_id"
     t.string   "file_file_name"
     t.string   "file_content_type"
     t.integer  "file_file_size"
@@ -108,7 +108,7 @@ ActiveRecord::Schema.define(version: 20170322021028) do
 
   create_table "mentions", force: :cascade do |t|
     t.integer  "account_id"
-    t.integer  "status_id"
+    t.bigint   "status_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true, using: :btree
@@ -124,7 +124,7 @@ ActiveRecord::Schema.define(version: 20170322021028) do
 
   create_table "notifications", force: :cascade do |t|
     t.integer  "account_id"
-    t.integer  "activity_id"
+    t.bigint   "activity_id"
     t.string   "activity_type"
     t.datetime "created_at",      null: false
     t.datetime "updated_at",      null: false
@@ -172,7 +172,7 @@ ActiveRecord::Schema.define(version: 20170322021028) do
   end
 
   create_table "preview_cards", force: :cascade do |t|
-    t.integer  "status_id"
+    t.bigint   "status_id"
     t.string   "url",                default: "", null: false
     t.string   "title"
     t.string   "description"
@@ -188,7 +188,7 @@ ActiveRecord::Schema.define(version: 20170322021028) do
   create_table "reports", force: :cascade do |t|
     t.integer  "account_id",                        null: false
     t.integer  "target_account_id",                 null: false
-    t.integer  "status_ids",        default: [],    null: false, array: true
+    t.bigint   "status_ids",        default: [],    null: false, array: true
     t.text     "comment",           default: "",    null: false
     t.boolean  "action_taken",      default: false, null: false
     t.datetime "created_at",                        null: false
@@ -205,14 +205,14 @@ ActiveRecord::Schema.define(version: 20170322021028) do
     t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true, using: :btree
   end
 
-  create_table "statuses", force: :cascade do |t|
+  create_table "statuses", id: :bigserial, force: :cascade do |t|
     t.string   "uri"
     t.integer  "account_id",                             null: false
     t.text     "text",                   default: "",    null: false
     t.datetime "created_at",                             null: false
     t.datetime "updated_at",                             null: false
-    t.integer  "in_reply_to_id"
-    t.integer  "reblog_of_id"
+    t.bigint   "in_reply_to_id"
+    t.bigint   "reblog_of_id"
     t.string   "url"
     t.boolean  "sensitive",              default: false
     t.integer  "visibility",             default: 0,     null: false
@@ -227,14 +227,14 @@ ActiveRecord::Schema.define(version: 20170322021028) do
   end
 
   create_table "statuses_tags", id: false, force: :cascade do |t|
-    t.integer "status_id", null: false
+    t.bigint  "status_id", null: false
     t.integer "tag_id",    null: false
     t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true, using: :btree
   end
 
   create_table "stream_entries", force: :cascade do |t|
     t.integer  "account_id"
-    t.integer  "activity_id"
+    t.bigint   "activity_id"
     t.string   "activity_type"
     t.datetime "created_at",                    null: false
     t.datetime "updated_at",                    null: false