diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 343fc7e6e0..9aa04dda92 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Online
             selectedItem.Value = new PlaylistItem
             {
                 Beatmap = { Value = testBeatmapInfo },
-                Ruleset = { Value = testBeatmapInfo.Ruleset },
+                RulesetID = testBeatmapInfo.Ruleset.OnlineID,
             };
 
             Child = availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
diff --git a/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs
index c79395b343..36d6c6a306 100644
--- a/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = InitialBeatmap },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             }));
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 5c8c90e166..659cc22350 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -17,6 +17,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using osu.Game.Models;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -215,25 +216,25 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         {
                             ID = 0,
                             Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                            RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
                             Expired = true,
-                            RequiredMods =
+                            RequiredMods = new[]
                             {
-                                new OsuModHardRock(),
-                                new OsuModDoubleTime(),
-                                new OsuModAutoplay()
+                                new APIMod(new OsuModHardRock()),
+                                new APIMod(new OsuModDoubleTime()),
+                                new APIMod(new OsuModAutoplay())
                             }
                         },
                         new PlaylistItem
                         {
                             ID = 1,
                             Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                            RequiredMods =
+                            RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
+                            RequiredMods = new[]
                             {
-                                new OsuModHardRock(),
-                                new OsuModDoubleTime(),
-                                new OsuModAutoplay()
+                                new APIMod(new OsuModHardRock()),
+                                new APIMod(new OsuModDoubleTime()),
+                                new APIMod(new OsuModAutoplay())
                             }
                         }
                     }
@@ -314,12 +315,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                     BeatmapSet = new BeatmapSetInfo()
                                 }
                         },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                        RequiredMods =
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
+                        RequiredMods = new[]
                         {
-                            new OsuModHardRock(),
-                            new OsuModDoubleTime(),
-                            new OsuModAutoplay()
+                            new APIMod(new OsuModHardRock()),
+                            new APIMod(new OsuModDoubleTime()),
+                            new APIMod(new OsuModAutoplay())
                         }
                     });
                 }
@@ -348,12 +349,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         ID = index++,
                         OwnerID = 2,
                         Beatmap = { Value = b },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                        RequiredMods =
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
+                        RequiredMods = new[]
                         {
-                            new OsuModHardRock(),
-                            new OsuModDoubleTime(),
-                            new OsuModAutoplay()
+                            new APIMod(new OsuModHardRock()),
+                            new APIMod(new OsuModDoubleTime()),
+                            new APIMod(new OsuModAutoplay())
                         }
                     });
                 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 1d61a5d496..6144824ba0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -35,12 +36,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 ID = SelectedRoom.Value.Playlist.Count,
                 Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                RequiredMods =
+                RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
+                RequiredMods = new[]
                 {
-                    new OsuModHardRock(),
-                    new OsuModDoubleTime(),
-                    new OsuModAutoplay()
+                    new APIMod(new OsuModHardRock()),
+                    new APIMod(new OsuModDoubleTime()),
+                    new APIMod(new OsuModAutoplay())
                 }
             });
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 8f6ba6375f..41715f6cfb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -19,6 +19,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -99,7 +100,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -235,7 +236,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -257,7 +258,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         new PlaylistItem
                         {
                             Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                            RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                         }
                     }
                 }, API.LocalUser.Value);
@@ -287,7 +288,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         new PlaylistItem
                         {
                             Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                            RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                         }
                     }
                 }, API.LocalUser.Value);
@@ -318,7 +319,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -340,7 +341,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         new PlaylistItem
                         {
                             Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                            RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                         }
                     }
                 }, API.LocalUser.Value);
@@ -373,7 +374,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -393,7 +394,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -415,7 +416,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -454,7 +455,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -493,7 +494,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -532,7 +533,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -566,7 +567,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -606,7 +607,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -626,8 +627,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                        AllowedMods = { new OsuModHidden() }
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
+                        AllowedMods = new[] { new APIMod(new OsuModHidden()) }
                     }
                 }
             });
@@ -666,7 +667,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -697,7 +698,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         new PlaylistItem
                         {
                             Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                            RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                         }
                     }
                 }, API.LocalUser.Value);
@@ -715,7 +716,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     ID = 2,
                     Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
@@ -743,7 +744,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -779,7 +780,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -818,7 +819,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -849,7 +850,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -882,7 +883,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 869fb17317..a6151198cf 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -10,6 +10,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -72,7 +73,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 SelectedRoom.Value.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
@@ -89,8 +90,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 SelectedRoom.Value.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new TaikoRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new TaikoRuleset().RulesetInfo },
-                    AllowedMods = { new TaikoModSwap() }
+                    RulesetID = new TaikoRuleset().RulesetInfo.OnlineID,
+                    AllowedMods = new[] { new APIMod(new TaikoModSwap()) }
                 });
             });
 
@@ -112,7 +113,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 SelectedRoom.Value.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
@@ -127,7 +128,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 SelectedRoom.Value.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First()).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
index 73f2ed5b39..010e9dc078 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Stack.Push(player = new MultiplayerPlayer(Client.APIRoom, new PlaylistItem
                 {
                     Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                    Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset }
+                    RulesetID = Beatmap.Value.BeatmapInfo.Ruleset.OnlineID,
                 }, Client.Room?.Users.ToArray()));
             });
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs
index 936798e6b4..361178bfe4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs
@@ -146,12 +146,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         new PlaylistItem
                         {
                             Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
-                            Ruleset = { Value = Ruleset.Value }
+                            RulesetID = Ruleset.Value.OnlineID,
                         },
                         new PlaylistItem
                         {
                             Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
-                            Ruleset = { Value = Ruleset.Value },
+                            RulesetID = Ruleset.Value.OnlineID,
                             Expired = true
                         }
                     }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 9867e5225e..7834226f15 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             selectedItem.Value = new PlaylistItem
             {
                 Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset },
+                RulesetID = Beatmap.Value.BeatmapInfo.Ruleset.OnlineID
             };
 
             if (button != null)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 42ae279667..70d4d9dd55 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             selectedItem.Value = new PlaylistItem
             {
                 Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset },
+                RulesetID = Beatmap.Value.BeatmapInfo.Ruleset.OnlineID,
             };
 
             Child = new FillFlowContainer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs
index e63e58824f..8bfdda29d5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSettingsPlaylist.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using osu.Game.Models;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -161,12 +162,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                     BeatmapSet = new BeatmapSetInfo()
                                 }
                         },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                        RequiredMods =
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
+                        RequiredMods = new[]
                         {
-                            new OsuModHardRock(),
-                            new OsuModDoubleTime(),
-                            new OsuModAutoplay()
+                            new APIMod(new OsuModHardRock()),
+                            new APIMod(new OsuModDoubleTime()),
+                            new APIMod(new OsuModAutoplay())
                         }
                     });
                 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index d933491ab6..3333afc88b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -115,8 +115,17 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("change mod rate", () => ((OsuModDoubleTime)SelectedMods.Value[0]).SpeedChange.Value = 2);
             AddStep("create item", () => songSelect.BeatmapDetails.CreateNewItem());
 
-            AddAssert("item 1 has rate 1.5", () => Precision.AlmostEquals(1.5, ((OsuModDoubleTime)SelectedRoom.Value.Playlist.First().RequiredMods[0]).SpeedChange.Value));
-            AddAssert("item 2 has rate 2", () => Precision.AlmostEquals(2, ((OsuModDoubleTime)SelectedRoom.Value.Playlist.Last().RequiredMods[0]).SpeedChange.Value));
+            AddAssert("item 1 has rate 1.5", () =>
+            {
+                var mod = (OsuModDoubleTime)SelectedRoom.Value.Playlist.First().RequiredMods[0].ToMod(new OsuRuleset());
+                return Precision.AlmostEquals(1.5, mod.SpeedChange.Value);
+            });
+
+            AddAssert("item 2 has rate 2", () =>
+            {
+                var mod = (OsuModDoubleTime)SelectedRoom.Value.Playlist.Last().RequiredMods[0].ToMod(new OsuRuleset());
+                return Precision.AlmostEquals(2, mod.SpeedChange.Value);
+            });
         }
 
         /// <summary>
@@ -138,7 +147,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("create item", () => songSelect.BeatmapDetails.CreateNewItem());
 
             AddStep("change stored mod rate", () => mod.SpeedChange.Value = 2);
-            AddAssert("item has rate 1.5", () => Precision.AlmostEquals(1.5, ((OsuModDoubleTime)SelectedRoom.Value.Playlist.First().RequiredMods[0]).SpeedChange.Value));
+            AddAssert("item has rate 1.5", () =>
+            {
+                var m = (OsuModDoubleTime)SelectedRoom.Value.Playlist.First().RequiredMods[0].ToMod(new OsuRuleset());
+                return Precision.AlmostEquals(1.5, m.SpeedChange.Value);
+            });
         }
 
         private class TestPlaylistsSongSelect : PlaylistsSongSelect
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTeamVersus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTeamVersus.cs
index 781f0a1824..513c1413fa 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTeamVersus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTeamVersus.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
@@ -159,7 +159,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0)).BeatmapInfo },
-                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                     }
                 }
             });
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 11df115b1a..a05d01613c 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 LoadScreen(resultsScreen = new TestResultsScreen(getScore?.Invoke(), 1, new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 }));
             });
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
index 68225f6d64..578ea63b4e 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomCreation.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 room.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = importedBeatmap.Beatmaps.First() },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 room.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = importedBeatmap.Beatmaps.First() },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 room.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = importedBeatmap.Beatmaps.First() },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
@@ -173,7 +173,7 @@ namespace osu.Game.Tests.Visual.Playlists
                             }
                         }
                     },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                    RulesetID = new OsuRuleset().RulesetInfo.OnlineID
                 });
             });
 
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 903aaa89e3..9d45229961 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -727,30 +727,18 @@ namespace osu.Game.Online.Multiplayer
             RoomUpdated?.Invoke();
         }
 
-        private PlaylistItem createPlaylistItem(MultiplayerPlaylistItem item)
+        private PlaylistItem createPlaylistItem(MultiplayerPlaylistItem item) => new PlaylistItem
         {
-            var ruleset = Rulesets.GetRuleset(item.RulesetID);
-
-            Debug.Assert(ruleset != null);
-
-            var rulesetInstance = ruleset.CreateInstance();
-
-            var playlistItem = new PlaylistItem
-            {
-                ID = item.ID,
-                BeatmapID = item.BeatmapID,
-                OwnerID = item.OwnerID,
-                Ruleset = { Value = ruleset },
-                Expired = item.Expired,
-                PlaylistOrder = item.PlaylistOrder,
-                PlayedAt = item.PlayedAt
-            };
-
-            playlistItem.RequiredMods.AddRange(item.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
-            playlistItem.AllowedMods.AddRange(item.AllowedMods.Select(m => m.ToMod(rulesetInstance)));
-
-            return playlistItem;
-        }
+            ID = item.ID,
+            BeatmapID = item.BeatmapID,
+            OwnerID = item.OwnerID,
+            RulesetID = item.RulesetID,
+            Expired = item.Expired,
+            PlaylistOrder = item.PlaylistOrder,
+            PlayedAt = item.PlayedAt,
+            RequiredMods = item.RequiredMods.ToArray(),
+            AllowedMods = item.AllowedMods.ToArray()
+        };
 
         /// <summary>
         /// Retrieves a <see cref="APIBeatmap"/> from an online source.
diff --git a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
index 8ec073ff1e..d74cdd8c34 100644
--- a/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
+++ b/osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Online.Rooms
             BeatmapID = item.BeatmapID;
             BeatmapChecksum = item.Beatmap.Value?.MD5Hash ?? string.Empty;
             RulesetID = item.RulesetID;
-            RequiredMods = item.RequiredMods.Select(m => new APIMod(m)).ToArray();
-            AllowedMods = item.AllowedMods.Select(m => new APIMod(m)).ToArray();
+            RequiredMods = item.RequiredMods.ToArray();
+            AllowedMods = item.AllowedMods.ToArray();
             Expired = item.Expired;
             PlaylistOrder = item.PlaylistOrder ?? 0;
             PlayedAt = item.PlayedAt;
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index f1bb57bd9d..85327be037 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -65,7 +65,11 @@ namespace osu.Game.Online.Rooms
 
         public ScoreInfo CreateScoreInfo(RulesetStore rulesets, PlaylistItem playlistItem, [NotNull] BeatmapInfo beatmap)
         {
-            var rulesetInstance = playlistItem.Ruleset.Value.CreateInstance();
+            var ruleset = rulesets.GetRuleset(playlistItem.RulesetID);
+            if (ruleset == null)
+                throw new InvalidOperationException($"Couldn't create score with unknown ruleset: {playlistItem.RulesetID}");
+
+            var rulesetInstance = ruleset.CreateInstance();
 
             var scoreInfo = new ScoreInfo
             {
diff --git a/osu.Game/Online/Rooms/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
index 83a70c405b..c082babb01 100644
--- a/osu.Game/Online/Rooms/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
@@ -10,8 +9,6 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.Rooms
 {
@@ -49,68 +46,25 @@ namespace osu.Game.Online.Rooms
         [JsonIgnore]
         public readonly Bindable<IBeatmapInfo> Beatmap = new Bindable<IBeatmapInfo>();
 
-        [JsonIgnore]
-        public readonly Bindable<IRulesetInfo> Ruleset = new Bindable<IRulesetInfo>();
-
-        [JsonIgnore]
-        public readonly BindableList<Mod> AllowedMods = new BindableList<Mod>();
-
-        [JsonIgnore]
-        public readonly BindableList<Mod> RequiredMods = new BindableList<Mod>();
-
         [JsonProperty("beatmap")]
         private APIBeatmap apiBeatmap { get; set; }
 
-        private APIMod[] allowedModsBacking;
-
         [JsonProperty("allowed_mods")]
-        private APIMod[] allowedMods
-        {
-            get => AllowedMods.Select(m => new APIMod(m)).ToArray();
-            set => allowedModsBacking = value;
-        }
-
-        private APIMod[] requiredModsBacking;
+        public APIMod[] AllowedMods { get; set; } = Array.Empty<APIMod>();
 
         [JsonProperty("required_mods")]
-        private APIMod[] requiredMods
-        {
-            get => RequiredMods.Select(m => new APIMod(m)).ToArray();
-            set => requiredModsBacking = value;
-        }
+        public APIMod[] RequiredMods { get; set; } = Array.Empty<APIMod>();
 
         public PlaylistItem()
         {
             Beatmap.BindValueChanged(beatmap => BeatmapID = beatmap.NewValue?.OnlineID ?? -1);
-            Ruleset.BindValueChanged(ruleset => RulesetID = ruleset.NewValue?.OnlineID ?? 0);
         }
 
         public void MarkInvalid() => valid.Value = false;
 
-        public void MapObjects(IRulesetStore rulesets)
+        public void MapObjects()
         {
             Beatmap.Value ??= apiBeatmap;
-            Ruleset.Value ??= rulesets.GetRuleset(RulesetID);
-
-            Debug.Assert(Ruleset.Value != null);
-
-            Ruleset rulesetInstance = Ruleset.Value.CreateInstance();
-
-            if (allowedModsBacking != null)
-            {
-                AllowedMods.Clear();
-                AllowedMods.AddRange(allowedModsBacking.Select(m => m.ToMod(rulesetInstance)));
-
-                allowedModsBacking = null;
-            }
-
-            if (requiredModsBacking != null)
-            {
-                RequiredMods.Clear();
-                RequiredMods.AddRange(requiredModsBacking.Select(m => m.ToMod(rulesetInstance)));
-
-                requiredModsBacking = null;
-            }
         }
 
         #region Newtonsoft.Json implicit ShouldSerialize() methods
@@ -133,7 +87,7 @@ namespace osu.Game.Online.Rooms
                && BeatmapID == other.BeatmapID
                && RulesetID == other.RulesetID
                && Expired == other.Expired
-               && allowedMods.SequenceEqual(other.allowedMods)
-               && requiredMods.SequenceEqual(other.requiredMods);
+               && AllowedMods.SequenceEqual(other.AllowedMods)
+               && RequiredMods.SequenceEqual(other.RequiredMods);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
index 2026106c42..d534a1e374 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Rulesets;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
@@ -15,6 +16,9 @@ namespace osu.Game.Screens.OnlinePlay.Components
         private const float height = 28;
         private const float transition_duration = 100;
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         private Container drawableRuleset;
 
         public ModeTypeInfo()
@@ -56,11 +60,14 @@ namespace osu.Game.Screens.OnlinePlay.Components
         private void updateBeatmap()
         {
             var item = Playlist.FirstOrDefault();
+            var ruleset = item == null ? null : rulesets.GetRuleset(item.RulesetID)?.CreateInstance();
 
-            if (item?.Beatmap != null)
+            if (item?.Beatmap != null && ruleset != null)
             {
+                var mods = item.RequiredMods.Select(m => m.ToMod(ruleset)).ToArray();
+
                 drawableRuleset.FadeIn(transition_duration);
-                drawableRuleset.Child = new DifficultyIcon(item.Beatmap.Value, item.Ruleset.Value, item.RequiredMods) { Size = new Vector2(height) };
+                drawableRuleset.Child = new DifficultyIcon(item.Beatmap.Value, ruleset.RulesetInfo, mods) { Size = new Vector2(height) };
             }
             else
                 drawableRuleset.FadeOut(transition_duration);
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 238aa4059d..21b64b61bb 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
-using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
@@ -27,9 +26,6 @@ namespace osu.Game.Screens.OnlinePlay.Components
         protected IBindable<Room> JoinedRoom => joinedRoom;
         private readonly Bindable<Room> joinedRoom = new Bindable<Room>();
 
-        [Resolved]
-        private IRulesetStore rulesets { get; set; }
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -117,7 +113,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
             try
             {
                 foreach (var pi in room.Playlist)
-                    pi.MapObjects(rulesets);
+                    pi.MapObjects();
 
                 var existing = rooms.FirstOrDefault(e => e.RoomID.Value == room.RoomID.Value);
                 if (existing == null)
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index e1f7ea5e92..dcf2a5a480 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -69,8 +69,9 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly DelayedLoadWrapper onScreenLoader = new DelayedLoadWrapper(Empty) { RelativeSizeAxes = Axes.Both };
         private readonly IBindable<bool> valid = new Bindable<bool>();
         private readonly Bindable<IBeatmapInfo> beatmap = new Bindable<IBeatmapInfo>();
-        private readonly Bindable<IRulesetInfo> ruleset = new Bindable<IRulesetInfo>();
-        private readonly BindableList<Mod> requiredMods = new BindableList<Mod>();
+
+        private IRulesetInfo ruleset;
+        private Mod[] requiredMods;
 
         private Container maskingContainer;
         private Container difficultyIconContainer;
@@ -86,6 +87,9 @@ namespace osu.Game.Screens.OnlinePlay
         private PanelBackground panelBackground;
         private FillFlowContainer mainFillFlow;
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -108,8 +112,6 @@ namespace osu.Game.Screens.OnlinePlay
 
             beatmap.BindTo(item.Beatmap);
             valid.BindTo(item.Valid);
-            ruleset.BindTo(item.Ruleset);
-            requiredMods.BindTo(item.RequiredMods);
 
             if (item.Expired)
                 Colour = OsuColour.Gray(0.5f);
@@ -119,6 +121,11 @@ namespace osu.Game.Screens.OnlinePlay
         private void load()
         {
             maskingContainer.BorderColour = colours.Yellow;
+
+            ruleset = rulesets.GetRuleset(Item.RulesetID);
+            var rulesetInstance = ruleset?.CreateInstance();
+
+            requiredMods = Item.RequiredMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
         }
 
         protected override void LoadComplete()
@@ -145,9 +152,7 @@ namespace osu.Game.Screens.OnlinePlay
             }, true);
 
             beatmap.BindValueChanged(_ => Scheduler.AddOnce(refresh));
-            ruleset.BindValueChanged(_ => Scheduler.AddOnce(refresh));
             valid.BindValueChanged(_ => Scheduler.AddOnce(refresh));
-            requiredMods.CollectionChanged += (_, __) => Scheduler.AddOnce(refresh);
 
             onScreenLoader.DelayedLoadStarted += _ =>
             {
@@ -276,7 +281,7 @@ namespace osu.Game.Screens.OnlinePlay
             }
 
             if (Item.Beatmap.Value != null)
-                difficultyIconContainer.Child = new DifficultyIcon(Item.Beatmap.Value, ruleset.Value, requiredMods, performBackgroundDifficultyLookup: false) { Size = new Vector2(icon_height) };
+                difficultyIconContainer.Child = new DifficultyIcon(Item.Beatmap.Value, ruleset, requiredMods, performBackgroundDifficultyLookup: false) { Size = new Vector2(icon_height) };
             else
                 difficultyIconContainer.Clear();
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index f4d7823fcc..9f917c978c 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Extensions;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.Rooms;
@@ -78,7 +77,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 {
                     bool matchingFilter = true;
 
-                    matchingFilter &= r.Room.Playlist.Count == 0 || criteria.Ruleset == null || r.Room.Playlist.Any(i => i.Ruleset.Value.MatchesOnlineID(criteria.Ruleset));
+                    matchingFilter &= r.Room.Playlist.Count == 0 || criteria.Ruleset == null || r.Room.Playlist.Any(i => i.RulesetID == criteria.Ruleset.OnlineID);
 
                     if (!string.IsNullOrEmpty(criteria.SearchString))
                         matchingFilter &= r.FilterTerms.Any(term => term.Contains(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase));
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2d5225639f..02e1b115a0 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -386,7 +386,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
             if (SelectedItem.Value == null || !this.IsCurrentScreen())
                 return;
 
-            Mods.Value = UserMods.Value.Concat(SelectedItem.Value.RequiredMods).ToList();
+            var rulesetInstance = rulesets.GetRuleset(SelectedItem.Value.RulesetID)?.CreateInstance();
+            Debug.Assert(rulesetInstance != null);
+            Mods.Value = UserMods.Value.Concat(SelectedItem.Value.RequiredMods.Select(m => m.ToMod(rulesetInstance))).ToList();
         }
 
         private void updateRuleset()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 073497e1ce..12caf1fde1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -11,7 +11,6 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
@@ -71,8 +70,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     BeatmapID = item.BeatmapID,
                     BeatmapChecksum = item.Beatmap.Value.MD5Hash,
                     RulesetID = item.RulesetID,
-                    RequiredMods = item.RequiredMods.Select(m => new APIMod(m)).ToArray(),
-                    AllowedMods = item.AllowedMods.Select(m => new APIMod(m)).ToArray()
+                    RequiredMods = item.RequiredMods.ToArray(),
+                    AllowedMods = item.AllowedMods.ToArray()
                 };
 
                 Task task = itemToEdit != null ? client.EditPlaylistItem(multiplayerItem) : client.AddPlaylistItem(multiplayerItem);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a397493bab..cb50a56052 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             // update local mods based on room's reported status for the local user (omitting the base call implementation).
             // this makes the server authoritative, and avoids the local user potentially setting mods that the server is not aware of (ie. if the match was started during the selection being changed).
             var ruleset = Ruleset.Value.CreateInstance();
-            Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
+            Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods.Select(m => m.ToMod(ruleset))).ToList();
         }
 
         [Resolved(canBeNull: true)]
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 63957caee3..eab1f83967 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
@@ -37,6 +38,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(CanBeNull = true)]
         protected IBindable<PlaylistItem> SelectedItem { get; private set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         protected override UserActivity InitialActivity => new UserActivity.InLobby(room);
 
         protected readonly Bindable<IReadOnlyList<Mod>> FreeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
@@ -78,10 +82,15 @@ namespace osu.Game.Screens.OnlinePlay
         {
             base.LoadComplete();
 
-            // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
-            // Similarly, freeMods is currently empty but should only contain the allowed mods.
-            Mods.Value = SelectedItem?.Value?.RequiredMods.Select(m => m.DeepClone()).ToArray() ?? Array.Empty<Mod>();
-            FreeMods.Value = SelectedItem?.Value?.AllowedMods.Select(m => m.DeepClone()).ToArray() ?? Array.Empty<Mod>();
+            var rulesetInstance = SelectedItem?.Value?.RulesetID == null ? null : rulesets.GetRuleset(SelectedItem.Value.RulesetID)?.CreateInstance();
+
+            if (rulesetInstance != null)
+            {
+                // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
+                // Similarly, freeMods is currently empty but should only contain the allowed mods.
+                Mods.Value = SelectedItem.Value.RequiredMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+                FreeMods.Value = SelectedItem.Value.AllowedMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+            }
 
             Mods.BindValueChanged(onModsChanged);
             Ruleset.BindValueChanged(onRulesetChanged);
@@ -110,15 +119,11 @@ namespace osu.Game.Screens.OnlinePlay
                 {
                     Value = Beatmap.Value.BeatmapInfo
                 },
-                Ruleset =
-                {
-                    Value = Ruleset.Value
-                }
+                RulesetID = Ruleset.Value.OnlineID,
+                RequiredMods = Mods.Value.Select(m => new APIMod(m)).ToArray(),
+                AllowedMods = FreeMods.Value.Select(m => new APIMod(m)).ToArray()
             };
 
-            item.RequiredMods.AddRange(Mods.Value.Select(m => m.DeepClone()));
-            item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.DeepClone()));
-
             SelectItem(item);
             return true;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 35d417520e..2b071175d5 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Extensions;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
@@ -36,10 +37,11 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             if (!Beatmap.Value.BeatmapInfo.MatchesOnlineID(PlaylistItem.Beatmap.Value))
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
 
-            if (!ruleset.Value.MatchesOnlineID(PlaylistItem.Ruleset.Value))
+            if (ruleset.Value.OnlineID != PlaylistItem.RulesetID)
                 throw new InvalidOperationException("Current Ruleset does not match PlaylistItem's Ruleset");
 
-            if (!PlaylistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
+            var localMods = Mods.Value.Select(m => new APIMod(m)).ToArray();
+            if (!PlaylistItem.RequiredMods.All(m => localMods.Any(m.Equals)))
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
index 0fd76f7e25..3ac576b18e 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using osu.Framework.Screens;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.Select;
@@ -30,7 +31,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     break;
 
                 case 1:
-                    populateItemFromCurrent(Playlist.Single());
+                    Playlist.Clear();
+                    createNewItem();
                     break;
             }
 
@@ -41,24 +43,14 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             PlaylistItem item = new PlaylistItem
             {
-                ID = Playlist.Count == 0 ? 0 : Playlist.Max(p => p.ID) + 1
+                ID = Playlist.Count == 0 ? 0 : Playlist.Max(p => p.ID) + 1,
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                RulesetID = Ruleset.Value.OnlineID,
+                RequiredMods = Mods.Value.Select(m => new APIMod(m)).ToArray(),
+                AllowedMods = FreeMods.Value.Select(m => new APIMod(m)).ToArray()
             };
 
-            populateItemFromCurrent(item);
-
             Playlist.Add(item);
         }
-
-        private void populateItemFromCurrent(PlaylistItem item)
-        {
-            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
-            item.Ruleset.Value = Ruleset.Value;
-
-            item.RequiredMods.Clear();
-            item.RequiredMods.AddRange(Mods.Value.Select(m => m.DeepClone()));
-
-            item.AllowedMods.Clear();
-            item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.DeepClone()));
-        }
     }
 }
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 7607122ef0..ed86d572b9 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new PlaylistItem
                     {
                         Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
-                        Ruleset = { Value = Ruleset.Value }
+                        RulesetID = Ruleset.Value.OnlineID
                     }
                 }
             };
diff --git a/osu.Game/Tests/Visual/OnlinePlay/TestRoomManager.cs b/osu.Game/Tests/Visual/OnlinePlay/TestRoomManager.cs
index 4cbc6174c9..73d0df2c36 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/TestRoomManager.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/TestRoomManager.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
                 {
                     room.Playlist.Add(new PlaylistItem
                     {
-                        Ruleset = { Value = ruleset },
+                        RulesetID = ruleset.OnlineID,
                         Beatmap =
                         {
                             Value = new BeatmapInfo