@Roman *********
okay there is NO problem applying for a yearly extension based on marriage from an expired non-O visa entry (90 day stamp) that has gone to amnesty as long as you apply BEFORE the 26th of Sept (the day amnesty runs out).
GO to the immigration office and get the hand out that lists the requirements, ask them if there's anything else you need and as long as you meet those requirements you'll get a yearly extension.
it doesn't make a difference that your actual Non-O VISA (the sticker itself) expired as the visa doesn't let you stay in the country the small blue rectangular entry stamp for 90 days you got when you entered the country on the visa is what lets you stay AND that expired months ago.
Meet the requirements get the extension, don't meet them, your option is to "prepare to depart" on or by the 26th of Sept when amnesty runs out.