Rework systemid

**NOTE**: This is a work in progress and needs some discussion.