Include root object in model

This gives a proper drop target for new objects.

Also, *actually* stop updating the wrong components block when
switching between kinds.