"That's how America got into the fix that will see the Social Security trust fund run out in 36 years unless something is done, according to James B. Lockhart III, deputy commissioner of the Social Security Administration."
This is easy. Tell every federal, state and local employee that they now have to contribute into the system. When they start to fight it, bring up personal accounts.
The other option is to give everyone exactly what state and federal employees have.
Either way...
"Tell every federal, state and local employee that they now have to contribute into the system."
Federal employees hired after 1983 do contribute to Social Security just like - in the same percentage amount as - everybody else. They are on a different retirement system than their predecessors.