Revert "Use just "M+ 1p" as the system font reference"

This reverts commit 2853fe06344960d47990e9ca4b950db31db16d46.

Never mind, seems like it was working.