What do you mean by broke the N900 power button functionality? When I press power button on my N900 with E19 + systemd, it's offer me to poweroff. E19 input settings recognize N900 power button as XF86PowerOff, and you can set action on this key at input settings as well as at ACPI settings too.